Merge 9 -> main #1077
Merged
Merge 9 -> main #1077
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Van Malleghem Antoine <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>
Signed-off-by: Van Malleghem Antoine <[email protected]> Signed-off-by: Antoine Van Malleghem <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Van Malleghem Antoine <[email protected]>
Signed-off-by: Martin Pecka <[email protected]>
Signed-off-by: Martin Pecka <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Martin Pecka <[email protected]>
This reverts commit 6ec0c52.
Signed-off-by: Athena Z <[email protected]>
Revert "Fix using lightmap and emissive map together (#1047)"
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
By adding the missing DL dependency Signed-off-by: Silvio Traversaro <[email protected]>
ahcorde
approved these changes
Oct 4, 2024
ahcorde
reviewed
Oct 4, 2024
There was a problem hiding this comment.
Windows CI is broken but we can fix this in a follow up PR
usage: colcon [-h] [--log-base LOG_BASE] [--log-level LOG_LEVEL]
{build,extension-points,extensions,graph,info,list,metadata,test,test-result,version-check}
...
colcon: error: unrecognized arguments: -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF
Not sure why it's working on |
Signed-off-by: Ian Chen <[email protected]>
|
merging this first. Will address windows CI github actions separately |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port gz-rendering9 to main
Branch comparison: main...gz-rendering9
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)